Auto merge of #1292 - brson:version, r=huonw
authorbors <bors@rust-lang.org>
Fri, 13 Feb 2015 22:31:46 +0000 (22:31 +0000)
committerbors <bors@rust-lang.org>
Fri, 13 Feb 2015 22:31:46 +0000 (22:31 +0000)
```
cargo 0.0.1-pre (9404539 2015-02-09 20:54:26 +0000) (built 2015-02-11)
```


Trivial merge